From 890259d6b52fd5f007104072d14e1a1f32573a5b Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Thu, 16 Feb 2006 14:10:01 +0000 Subject: [PATCH] Fix upgrade omissions. Signed-off-by: Christian Limpach --- linux-2.6-xen-sparse/arch/x86_64/kernel/pci-swiotlb-xen.c | 2 +- linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h | 2 +- linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/pci-swiotlb-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/pci-swiotlb-xen.c index 4763ff4d48..0a5a8d4f02 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/pci-swiotlb-xen.c +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/pci-swiotlb-xen.c @@ -40,8 +40,8 @@ void pci_swiotlb_init(void) (end_pfn > MAX_DMA32_PFN || force_iommu)) swiotlb = 1; if (swiotlb) { - swiotlb_init(); printk(KERN_INFO "PCI-DMA: Using software bounce buffering for IO (SWIOTLB)\n"); + swiotlb_init(); dma_ops = &swiotlb_dma_ops; } #else diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h index 0c0dc515a2..86afadd093 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h @@ -555,7 +555,7 @@ __asm__ __volatile__("6667:movl %1, %0\n6668:\n" \ #else #define smp_rmb() rmb() #define smp_mb() mb() -#define set_mb(var, value) do { xchg(&var, value); } while (0) +#define set_mb(var, value) do { (void) xchg(&var, value); } while (0) #endif #define smp_read_barrier_depends() read_barrier_depends() #else diff --git a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h index 6a29a815f0..9010441554 100644 --- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h +++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/system.h @@ -336,7 +336,7 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, #define wmb() asm volatile("" ::: "memory") #endif #define read_barrier_depends() do {} while(0) -#define set_mb(var, value) do { xchg(&var, value); } while (0) +#define set_mb(var, value) do { (void) xchg(&var, value); } while (0) #define set_wmb(var, value) do { var = value; wmb(); } while (0) #define warn_if_not_ulong(x) do { unsigned long foo; (void) (&(x) == &foo); } while (0) -- 2.30.2